Merge linux (3.18.5-1~exp1) import into refs/heads/workingbranch
authormaximilian attems <maks@debian.org>
Sat, 31 Jan 2015 21:20:40 +0000 (21:20 +0000)
committermaximilian attems <maks@debian.org>
Sat, 31 Jan 2015 21:20:40 +0000 (21:20 +0000)

Trivial merge